Eclipse Community Forums: EGit / JGit

Home » Eclipse Projects » EGit / JGit » Newbie questions(Newbie questions workflow push pull synchronize merge remote)

Show: Today's Messages :: Show Polls :: Message Navigator

Newbie questions [message #672020]

Thu, 19 May 2011 15:30

Guillaume Polet

Messages: 1
Registered: May 2011

Junior Member

I am a newbie on both git and EGit and I am exploring their capabilities in order to move from CVS to Git. My mind is most likely corrupted by a CVS vision and therefore I could like to find a few answers to some questions I have regarding Git/EGit.

Forgive me for blowing questions like this but hopefully somebody will be able to help on those topics (I have already looked on Google to find some answers but now I feel like I am wasting my time and looping over the same articles constantly).
1) In EGit, is there a console view like there is for CVS? It would gretly help me understanding what is under the hood
2) Is there somewhere, an article describing a "good" way for working collaboratively with Git/Egit? Here is what my intent was (I have setup gitolite on remote server):
* Clone a remote repository
* Checkout the repository in Eclipse
* Work on my projects and commit files regularly (locally)
* Then pull from the remote repository and merge changes
* Eventually, push my repository to the remote one.
Somehow I have the feeling that this is not exactly how Git expects users to work
3) How do we merge conflicts with EGit? I have successfully created a conflicts or two. After trying many actions I ended up with a diff editor and I tried to solve the conflicts. I then tried to perform "Mark as merged" and "Commit" but the conflict remains.
4) More of a general question on Git: this is me probably just being stupid and ignorant, but I have a hard time understanding how Git will simplify my job when I need to merge branches? Ok it will handle file renames better than CVS, no question about that, but besides that are their other benefits?

Many thanks in advance if someone can help me.

Report message to a moderator

Re: Newbie questions [message #673225 is a reply to message #672020]

Sun, 22 May 2011 23:13

Matthias Sohn

Messages: 924
Registered: July 2009

Senior Member

1) no, there is no console view as EGit doesn't rely on command line but instead uses JGit API
2) there are many ways to use git, it doesn't expect a specific workflow, what you are describing is
one way. Do you know the git community book [1]? If you prefer a more linear history have a look
at rebase [2]. Push doesn't push the repository but only the changes you specified.
You may want to go through the basic git tutorial [3].
3) For resolving merge conflicts have a look at [4]
4) yes: it just works

[1] http://book.git-scm.com/3_distributed_workflows.html
[2] http://book.git-scm.com/4_rebasing.html
[3] http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
[4] http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_conflict

Report message to a moderator

Previous Topic:	Synchronize view shows non-existent white-space and other outgoing changes
Next Topic:	Receiving tags and branches with jgit

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue May 30 09:22:08 GMT 2017

.:: Contact :: Home ::.