Hello All,
After 28 hours of project time, I am still struggling to deal with
conflicts. When I compare my repository with LT, I see the message, "Can’t
automatically merge. Don’t worry, you can still create the pull request."
Refer to the attachment 'cant-automatically-merge.png'.
(Furthermore, I do not understand why the conflicts first occurred, because
I did not edit the conflicting files.)
I cannot see how synchronize my fork and my clone of my fork with the LT
repository.
I plan to delete my repository of LT
(https://github.com/MikeUnwalla/languagetool) and to uninstall GitHub
desktop and start again. What are the possible problems if I start again?
I think that the correct workflow to install and set up is:
1. Install Git on my computer. (To do that, I will reinstall GitHub
Desktop.)
2. Fork LT to make my GitHub repository of LT. (Which will have the same URL
as my current repository.)
3. Clone my LT repository to my computer. (My GitHub repository becomes the
'origin'.)
These pages discuss the workflow for making changes:
https://help.github.com/articles/what-is-a-good-git-workflow/
http://scottchacon.com/2011/08/31/github-flow.html
Each time that I work on something new:
1. Make a branch on my clone.
2. Change the content of a file (usually grammar.xml) and commit locally.
3. Push my new work to the same branch on my GitHub repository.
4. Create a pull request so that other LT people can review and comment.
5. When all is OK, Daniel merges my changes into the LT repository. (I know
that I have permission to do that, but until I am sure about what I am
doing, I don’t want to do this.)
6. Delete the branch from my clone (local repository) and push the change
(the deletion of the branch) to my GitHub repository.
7. Pull data from the LT repository. (Pull=fetch+merge)
Is that workflow correct? Is there a better workflow?
NOTES FOR NEW USERS OF GIT
Git and GitHub are not the same. "Git is a revision control system, a tool
to manage your source code history. GitHub is a hosting service for Git
repositories"
(http://stackoverflow.com/questions/13321556/difference-between-git-and-gith
ub).
Git is difficult. The PDF version of the manual has 574 pages
(https://git-scm.com/book/en/v2).
GitHub Desktop has only a subset of Git commands. For some types of
conflicts, you must use the command line. For example, a GitHub Support
person tells me that a "discard is failing due to the merge conflicts in the
grammar.xml file" and that I must use the command line to resolve the
conflict
(https://help.github.com/articles/resolving-a-merge-conflict-from-the-comman
d-line).
The tutorial that comes with GitHub Desktop is a hindrance, not a help.
For a nice graphic that shows what to do when you mess up, refer to
http://justinhileman.info/article/git-pretty/git-pretty.png.
Regards,
Mike
-----Original Message-----
From: Mike Unwalla [mailto:m...@techscribe.co.uk]
Sent: 15 April 2016 14:51
To: languagetool-devel@lists.sourceforge.net
Subject: GitHub Desktop: request for help
Hi All,
I tried to make my first commit, using GitHub Desktop. I was not successful.
My pull request was for a new EN grammar rule. On my computer, all seemed
OK. I created the pull request, but it does not have the new rule
(https://github.com/languagetool-org/languagetool/pull/390/files).
I don't know what I am doing wrong. So, I'd appeciate help. Contact me
off-list. Thanks.
Regards,
Mike Unwalla
Contact: www.techscribe.co.uk/techw/contact.htm
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Languagetool-devel mailing list
Languagetool-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-devel
