Hi Bengt,
Harald already did explain most of it.
If you really want to see a mess take a look at certain commits I did in
pax web, it's quite wonderfull, even so I was
the only one working on, I somehow managed to push only certain parts
that needed lots of merging.
The good thing though, usually the merging works out quite well with
git, compared to svn :)
For a indepth git-howto Andreas is probably best :)
He also likes to give "guest" lectures at the karaf irc or in private
mode ;)
Regarding Tool support I usually tend to use either comand line works
quite well on linux, sometimes mixed
with EGit (not as good), and TortoiseGit when running on windows which
is the best Git Tool around for working
on Windows. Just like the SVN Tools
Regards, Achim
Am 06.02.2012 21:08, schrieb Harald Wellmann:
Hi Bengt,
welcome to the wonderful world of Git...
You're not alone, I'm still fighting with it after 9 months. For some
reason, Git's user-friendliness is inverse to its popularity, and I
think it's rather a shame that GitHub is GitHub and not MercurialHub.
Anyway, the Pax Logging repo looks ok to me. The two commits are
expected when two people work in parallel: think of your commit as a
temporary branch which then had to be merged with someone else's
changes in a second commit.
As Git allows you to forge history, there might be a way around that,
but I don't want to know ;-)
You seem to be working with two GitHub repos, the official one and
your fork. I'm not sure which one is origin and which one is upstream.
At any rate, it's just unneeded complexity when you can directly push
to the ops4j repo.
To set your username and email, use
git config --global -e
Most of the time, I use Git via Eclipse and EGit - I'm not too happy
with EGit either, compared to Subversive or MercurialEclipse, but it
does help.
Cheers,
Harald
_______________________________________________
general mailing list
[email protected]
http://lists.ops4j.org/mailman/listinfo/general
--
- Apache Karaf<http://karaf.apache.org/> Committer& PMC
- OPS4J Pax Web<http://wiki.ops4j.org/display/paxweb/Pax+Web/> Committer&
Project Lead
- Blog<http://notizblog.nierbeck.de/>
_______________________________________________
general mailing list
[email protected]
http://lists.ops4j.org/mailman/listinfo/general
