05-09-2019, 09:55 PM
we try to keep label that are logically related together
instead of reviewing the whole file you can do a few things:
- use meldmerge simply fantastic
- ask git: suppose that before you pull you are on commit xxxx, after pull you can execute this command
git diff HEAD..xxxx include/language
- ask git:
git log include/language (this command give you the exact commits where the files changed, suppose you see commit yyyy changes the language file)
git show yyyy
I updated the file. Thanks!
instead of reviewing the whole file you can do a few things:
- use meldmerge simply fantastic
- ask git: suppose that before you pull you are on commit xxxx, after pull you can execute this command
git diff HEAD..xxxx include/language
- ask git:
git log include/language (this command give you the exact commits where the files changed, suppose you see commit yyyy changes the language file)
git show yyyy
I updated the file. Thanks!
Joe
TSolucio
TSolucio