bzr pull needs a way to manage conflicts and resolve them.

Bug #514531 reported by Martin Owens
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Ground Control
Confirmed
Medium
Unassigned

Bug Description

If we start allowing users to do a bzr pull to update their branches to the latest versions, then we should also be ready to get merge conflicts.

Martin Owens (doctormo)
Changed in groundcontrol:
status: New → Confirmed
importance: Undecided → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.