Backdated by one year to get it off the front page. Don’t know another way. Sorry.
I’m not a noob. Retired Software Engineer. Been programming since about 1968 and first used SCCS for source control. Used too many source control systems over the years to count. But I’m new to git. Only used it once before couple of years ago.
I doing a Qt project after some time off since my other projects, and found GitKraken and of course GitHub.
So this project involves 4 computers for development and debug.
- Win1 – Windows 10 primary development.
- LinVM – Linux Mint VirtualBox VM hosted on Win1.
- Lin1 – Mini Asrock PC running Linux Mint.
- Win2 – Mini GigaByte Brix running Windows 10.
Installed Qt and GitKraken on all these systems. Developed the code and committed and pushed changes from all four systems. Hey I assumed it could handle changes from everywhere, what do I know? Pulled stuff down to start work on a system for dev or test each time.
Used the same profile when setting up GitKraken on all the systems. Maybe this was an issue. Tell me if so. What do I know?
Ok enough jawboning. Here’s the issue: On Win2, after the last pull, GitKraken now shows me this:
After last pull on Win2
Normally I would expect this. As I understand it, each system is keeping a “Local git Repo” and when you do a pull, of course it should show local files are different from the local repository. The thing is, I expected the interface to show me a way to do a stage and commit to clear these. In other words
“Hey, git, accept this pull and put it in your local repository!”
But I don’t see anyway to do that. If I click on those files no “staging” or anything like it shows up.
So if I were not such a fool and was using the command line interface, what would I do? Or would git command line have fixed this up automagically, because it knew that all successful pulls should be “commited” to the local repo?
Is this a GitKraken bug? Or expected behavour? And how do I fix it and move on?
Thanks a ton.
Here’s the whole picture displayed by GitKraken. Click for a larger view.
GitKraken after last pull on Win2
Git and GitKraken seem great. Don’t want to go back to SCCS, but I’m confused.
Thanks for your help.
After Editing .gitignore and pushing that to GitHub, the condition cleared itself. Now the file shown on the right list is just .gitignore. Not clear if this is a subtlety with git or an issue with GitKraken.