Getting a bit less lost :-)
The issue seems to be related to performing a rebase versus merge (on which you can find plenty of discussions about what is the best) which again is linked to branching (again lots of discussions on the internet whether it should be done that often or not) however it still isn't clear to me yet.
What does work for me at this point is...
- Change member A
- Commit and push (gets rejected if someone else changed member A as well)
- Fetch (don't use pull or you'll end up with a rebase)
- Merge (this will bring up the red marks)
- Use the merge tool on the marked conflicts
- Add to index (strange as an svn user, but this marks the conflict as resolved)
- Commit and push (now it will be accepted)
The result of this is a polution of your branch with merge-commits wich apparently can be solved by the rebase (but I still need to figure that out). The fact that pull is doing a rebase in eGit is controlled by Window - Preferences - Team - Git - Configuration : autosetuprebase always.
________________________________________
From: WDSCI-L [wdsci-l-bounces@xxxxxxxxxxxx] on behalf of Paul Nicolay [Paul.Nicolay@xxxxxxxxxx]
Sent: Tuesday, August 04, 2015 09:11
To: Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries
Subject: Re: [WDSCI-L] EDi 9.1 and eGit
Looking at this video;
https://www.youtube.com/watch?v=I8lHLSjWBRY I don't see any branches created at all and it is doing the same as I'm trying... however I just started from scratch once more but as soon as I pull changes as second user it marks the project as "rebase w/ merge" (it does show up the red carrets and allows me to merge and commit/push fine however).
I've read lots of things but so far I couldn't find a simple example that explains how to work with two developers (instead they all start with multiple complex branches which doesn't make understanding the basics any easier).
As far as gitignore is concerned... unlike in Svn, you need to add everything to Git yourself or nothing happens with it, so what is the point of having a gitignore (unless you would commit with -a which eGit isn't clearly doing as I don't see any of the Rational files on Github appearing).
Still totally lost :(
midrange.com
