Re: EDi 9.1 and eGit

The whole idea of branches (both on the repository and local) and the need for them is still a bit unclear to me (Subversion was easier in that context).

In both projects (which simulate two users) I just cloned the github repository... after which I started the test scenario.

Project 1: Change source A
Project 1: Commit and push
Project 2: Change source A
Project 2: Commit and push (not allowed)
Project 2: Pull

... and here I've seen already various things (I restared several times all over).

What I would expect is the red marks for conflicts on source A but that doesn't happen (currently it does happen but I get the rebase stuff).

I also have the impression that it does show up in Project Explorer but not in the I projects Navigator view ?

Guess I'm gonna delete my respository once more and start all over (lost the count).


-----Original Message-----
From: WDSCI-L [mailto:wdsci-l-bounces@xxxxxxxxxxxx] On Behalf Of Wilson, Jonathan
Sent: maandag 3 augustus 2015 19:13
To: Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries
Subject: Re: [WDSCI-L] EDi 9.1 and eGit


Reading that again, did you create a new branch on each "machine" (directory) then push the changes from "machine one, branch A"
and merge it into the master, then on "machine two" re-pull the master branch which should, in theory, merge/roll forward the changes from "master" into your "branch A". (Personally I would even call the two local "machines" branches by different names as well).

I think, but am not totally sure, that two developers creating commits to the master branch (Git clone, git checkout _master_, do stuff, commit, more stuff, commit, push - done on two "machines") becomes more complex to handle as both users are working directly on one branch (the
master) so that when you pull the now changed master you must integrate the changes into your own master path instead of just updating "the master" and its new state being reflected (applied) to all your commits.

Sorry I can't be much more help, as that's about where my knowledge runs out.