solving most git issues and questions

13 years ago by Pierre Joye — view source

unread

Hi!

As one, I have regular small but annoying issues with git. No big deal
or stoppers but they are mostly due to my lack of clue.

Following a little bit the questions and discussions on IRC, it seems
that we are many in the same situation. That's why I would like to
improve the FAQ and the workflow page to cover as much cases as
possible.

Please add all your questions here:

https://wiki.php.net/vcs/gitfaq-usecases

And let try to answer them one by one, for the best or recommended way
to do something.

Cheers,

Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

13 years ago by David Soria Parra — view source

unread

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please add all your questions here:

https://wiki.php.net/vcs/gitfaq-usecases

And let try to answer them one by one, for the best or recommended
way to do something.
Thank you. makes sense to put it into the wiki and discuss it :).

First of all I added some "solutions". We can comment on those and
find the recommended way to do it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPiCLHAAoJEAT0aMuPE7Z1hR4P/i69+bEvGBPntR3iU7ma/OZe
IRYz062XXyzZ3VlGoY36S4q9gJwimytXxRH2cs9ClLKlYh4N739QPNRJ3tfPkVZW
eKz4A/lg4aN45KInRQoyV2XnGB3wjXcBVrGrsfl5MZr53Fz3yxb/OjKupbgiVCWs
TgxJODzhoHiivxxxWF2RFl8MSsyQvDDxGdgDpeKMcy97HCUOhKYT2jmSt4PR6Qdc
atVFF/mh5kB7qdHAkon4yRr5ypy/+HvkaTR2xIvR+ukK7mXVyUt92ceOg2fWACJm
vqXhu2iJHizeVe2hdHCOrlVmuliUtHUlxcR8eAhqBD2Td0rzEbuIbd4oRb8QZnq5
UluKxu9iw9AzujIIhhpHrIlNVUjuYROezmLDEzBn2LDnavoNWqQi328hKqmA39+4
n+DS5U+QXw6Qf1aupCIypNgkYDfx8J5+Zp9hoQgVB43d7E6OuEzV3cmTESRITGeN
xYbHNhRybuxERqXSn8InWpm9FdNhBAT6VL3xwdun2h1hHgC70UpR9DohoatxsJE6
HX9r02yn18mua9G6uGM2BpVs1nUilRslkEXjdGiy2rgYfD0nLkOBE/QmpFH4nVO+
o5kaKnUHkntFPF1SiIZVlMLR4y4l+rzrYtrGRZJGx79lKUrlKcIECg5yswn8Y+/4
5rz9PJiq7JgAqu91SPBs
=Z/7r
-----END PGP SIGNATURE

13 years ago by Alan Knowles — view source

unread

Saw this mentioned on one of the blogs comments today.

http://nuclearsquid.com/writings/git-new-workdir/

It may be an easier to use for those working with multiple branches of
PHP, and enjoy the multiple directory for each branch approach.. (aka
old svn..)

Regards
Alan

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please add all your questions here:

https://wiki.php.net/vcs/gitfaq-usecases

And let try to answer them one by one, for the best or recommended
way to do something.
Thank you. makes sense to put it into the wiki and discuss it :).

First of all I added some "solutions". We can comment on those and
find the recommended way to do it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPiCLHAAoJEAT0aMuPE7Z1hR4P/i69+bEvGBPntR3iU7ma/OZe
IRYz062XXyzZ3VlGoY36S4q9gJwimytXxRH2cs9ClLKlYh4N739QPNRJ3tfPkVZW
eKz4A/lg4aN45KInRQoyV2XnGB3wjXcBVrGrsfl5MZr53Fz3yxb/OjKupbgiVCWs
TgxJODzhoHiivxxxWF2RFl8MSsyQvDDxGdgDpeKMcy97HCUOhKYT2jmSt4PR6Qdc
atVFF/mh5kB7qdHAkon4yRr5ypy/+HvkaTR2xIvR+ukK7mXVyUt92ceOg2fWACJm
vqXhu2iJHizeVe2hdHCOrlVmuliUtHUlxcR8eAhqBD2Td0rzEbuIbd4oRb8QZnq5
UluKxu9iw9AzujIIhhpHrIlNVUjuYROezmLDEzBn2LDnavoNWqQi328hKqmA39+4
n+DS5U+QXw6Qf1aupCIypNgkYDfx8J5+Zp9hoQgVB43d7E6OuEzV3cmTESRITGeN
xYbHNhRybuxERqXSn8InWpm9FdNhBAT6VL3xwdun2h1hHgC70UpR9DohoatxsJE6
HX9r02yn18mua9G6uGM2BpVs1nUilRslkEXjdGiy2rgYfD0nLkOBE/QmpFH4nVO+
o5kaKnUHkntFPF1SiIZVlMLR4y4l+rzrYtrGRZJGx79lKUrlKcIECg5yswn8Y+/4
5rz9PJiq7JgAqu91SPBs
=Z/7r
-----END PGP SIGNATURE

13 years ago by Ferenc Kovacs — view source

unread

imo it is already covered by
https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow

Saw this mentioned on one of the blogs comments today.

http://nuclearsquid.com/**writings/git-new-workdir/http://nuclearsquid.com/writings/git-new-workdir/

It may be an easier to use for those working with multiple branches of
PHP, and enjoy the multiple directory for each branch approach.. (aka old
svn..)

Regards
Alan

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please add all your questions here:

https://wiki.php.net/vcs/**gitfaq-usecases https://wiki.php.net/vcs/gitfaq-usecases

And let try to answer them one by one, for the best or recommended
way to do something.

Thank you. makes sense to put it into the wiki and discuss it :).

First of all I added some "solutions". We can comment on those and
find the recommended way to do it.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPiCLHAAoJEAT0aMuPE7Z1hR4P/i69+bEvGBPntR3iU7ma/OZe
IRYz062XXyzZ3VlGoY36S4q9gJwimytXxRH2cs9ClLKlYh4N739QPNRJ3tfPkVZW
eKz4A/lg4aN45KInRQoyV2XnGB3wjXcBVrGrsfl5MZr53Fz3yxb/OjKupbgiVCWs
TgxJODzhoHiivxxxWF2RFl8MSsyQvDDxGdgDpeKMcy97HCUOhKYT2jmSt4PR6Qdc
atVFF/mh5kB7qdHAkon4yRr5ypy/+HvkaTR2xIvR+ukK7mXVyUt92ceOg2fWACJm
vqXhu2iJHizeVe2hdHCOrlVmuliUtHUlxcR8eAhqBD2Td0rzEbuIbd4oRb8QZnq5
UluKxu9iw9AzujIIhhpHrIlNVUjuYROezmLDEzBn2LDnavoNWqQi328hKqmA39+4
n+DS5U+QXw6Qf1aupCIypNgkYDfx8J5+Zp9hoQgVB43d7E6OuEzV3cmTESRITGeN
xYbHNhRybuxERqXSn8InWpm9FdNhBAT6VL3xwdun2h1hHgC70UpR9DohoatxsJE6
HX9r02yn18mua9G6uGM2BpVs1nUilRslkEXjdGiy2rgYfD0nLkOBE/**QmpFH4nVO+
o5kaKnUHkntFPF1SiIZVlMLR4y4l+rzrYtrGRZJGx79lKUrlKcIECg5yswn8Y+/4
5rz9PJiq7JgAqu91SPBs
=Z/7r
-----END PGP SIGNATURE-----

--
Ferenc Kovács
@Tyr43l - http://tyrael.hu

13 years ago by Alan Knowles — view source

unread

Ahhhhh.. Missed that, I only saw the workflow page which I just noticed fleetingly mentions that there are alternative work flows in the faq.

regards
Alan

--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.

Ferenc Kovacs tyra3l@gmail.com wrote:

imo it is already covered by https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow

Saw this mentioned on one of the blogs comments today.

http://nuclearsquid.com/writings/git-new-workdir/

It may be an easier to use for those working with multiple branches of PHP, and enjoy the multiple directory for each branch approach.. (aka old svn..)

Regards
Alan

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Please add all your questions here:

https://wiki.php.net/vcs/gitfaq-usecases

And let try to answer them one by one, for the best or recommended
way to do something.

Thank you. makes sense to put it into the wiki and discuss it :).

--
Ferenc Kovács
@Tyr43l - http://tyrael.hu