question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

GitHub desktop causes data loss when origin is not pulled first before commit

See original GitHub issue

Describe the bug

Its may be complicated. Please Read twice.

Clone a repo with GitHub desktop and commit any change then . Commit on web or anywhere else. Then commit on GitHub desktop means

GitHub desktop is at commit number #23 (suppose) Then you commit on somewhere else so the Remote origin is at commit number #30(Suppose you commit 7 changes,) . Then go to GitHub desktop and don’t pull origin or refresh repo. Firstly commit. After commit try to push origin. This give u error that remote origin contain unsynced data so GitHub desktop says to pull origin and says to refresh repo then to push origin. If you do so. Its tries to merge data of commit number #23 and commit #30 which causes error in data. I lose a lot of data. I tries revert the commit still i didn’t get success.

Version & OS

GitHub desktop : 2.5.3 Microsoft Windows [Version 10.0.20170.1000]

Steps to reproduce the behavior

Explained above

Expected behavior

No data loss. and first refresh changes and to commit in a way causes no data loss.

Actual behavior

causes conflict in data and shows old data in repo.

Screenshots

Add screenshots to help explain your problem, if applicable.

Logs

Attach your logs by opening the Help menu and selecting Show Logs..., if applicable.

Additional context

example. https://github.com/darkRaspberry/Forest/commit/1309ed94078372d159f6aacb388ac96ff44f1c2f This is the merge your GitHub Desktop done automatically causing error

https://github.com/darkRaspberry/Forest/commit/76e6fdbafe82e7f0ff529e7ae199c7f75839741e This is a reverted commit. as i tried to get my data back by reverting commit. still nothing happened.

Serious issue when collaborating with other members

Issue Analytics

  • State:closed
  • Created 3 years ago
  • Comments:5 (2 by maintainers)

github_iconTop GitHub Comments

1reaction
darkRaspberrycommented, Jul 28, 2020

I try to produce same issue and send u logs.

0reactions
tierninhocommented, Sep 24, 2020

Closing this for now as we do not have enough information to proceed.

Read more comments on GitHub >

github_iconTop Results From Across the Web

Cannot push to GitHub - keeps saying need merge
This can cause the remote repository to lose commits; use it with care. If you do not wish to merge ... Use git...
Read more >
Setting up versioning on your computer
Make sure the file is actually in CSV format, not Excel/spreadsheet format. Step 2: Initialize a repository with GitHub Desktop. First, we make...
Read more >
How to Fix 'failed to push some refs to' Git Errors - Komodor
When this occurs, someone has pushed to the branch before you. Git wants you to pull first before you can push your committed...
Read more >
WebStorm - Commit and push changes to Git repository
A possible situation when you may still need to perform --force push is when you rebase a pushed branch and then want to...
Read more >
Using Git in Dreamweaver - Adobe Support
That is, these files are not yet committed to your Git repository. You can continue to work on your files and commit your...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found