Jakub Narebski <jnareb@gmail.com> writes:Same as bzr then I believe. "bzr pull" will suggest you to use "merge" in this situation, unless you say "pull --overwrite". Note that "bound branches" and "other branches" in bzr are not so different. The "master" (the one you make a checkout of) doesn't have to know it has checkouts, and the "checkout" just has one file pointing to the "master", and you can switch from one flow to the other with "bzr bind/unbind". So, in Bazaar, all repositories are /almost/ created equal ;-). -- Matthieu - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Greg Kroah-Hartman | [PATCH 006/196] Chinese: add translation of oops-tracing.txt |
| Eric Sandeen | Re: [RFC] Heads up on sys_fallocate() |
| YOSHIFUJI Hideaki / | request_module: runaway loop modprobe net-pf-1 (is Re: Linux 2.6.21-rc1) |
git: | |
| Gerrit Renker | [PATCH 0/37] dccp: Feature negotiation - last call for comments |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Ben Greear | Re: MACVLANs really best solution? How about a bridge with multiple bridge virtual... |
| Rafael J. Wysocki | 2.6.29-rc8: Reported regressions from 2.6.28 |
