It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to the rule. For the others on this … Read more
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
Here is the method I’ve used in the past with good success: /trunk – bleeding edge. Next major release of the code. May or may not work at any given time. /branches/1.0, 1.1, etc. Stable maintenance branches of the code. Used to fix bugs, stabilize new releases. If a maintenance branch, it should compile (if … Read more
From my answer to a different question: Distributed version control systems (DVCSs) solve different problems than Centralized VCSs. Comparing them is like comparing hammers and screwdrivers. Centralized VCS systems are designed with the intent that there is One True Source that is Blessed, and therefore Good. All developers work (checkout) from that source, and then … Read more
As of version 2012.1, Perforce supports the P4IGNORE environment variable. I updated my answer to this question about ignoring directories with an explanation of how it works. Then I noticed this answer, which is now superfluous I guess. Assuming you have a client named “CLIENT”, a directory named “foo” (located at your project root), and … Read more
# first time: make origin/branchname locally available as localname git checkout -b localname origin/branchname # othertimes git checkout localname git push origin For convenience, you may use the same string for localname & branchname When you checked out origin/branchname you weren’t really checking out a branch. origin/branchname is a “remote” name, and you can get … Read more
Go to Manage Access page under settings (https://github.com/user/repo/settings/access) and add the collaborators as needed. Screenshot:
Github blog spoke yesterday about Egit plugin: http://freshmeat.net/projects/jgit/
It’s a hack, but this worked for me: Set the Current version of the model in Xcode to one that you want to keep Remove the .xcdatamodeld from your project (Right-click -> Delete -> Remove Reference Only) Show the contents of the .xcdatamodeld package in the Finder (Right-click -> Show Package Contents) Delete the .xcdatamodel … Read more