Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conflict Issues #17

Closed
soachishti opened this issue Sep 1, 2017 · 2 comments
Closed

Conflict Issues #17

soachishti opened this issue Sep 1, 2017 · 2 comments
Assignees
@recluze @soachishti @bilalzaib

Comments

@soachishti
Copy link
Collaborator

soachishti commented Sep 1, 2017 •
edited

I am getting conflict every time I pull the code. Most of my commit are lost.

Kindly create a branch before making changes to the code.

We will then merge those branch back to the master branch. That is the solution which I can suggest now.

Let me know if there is any other better solution.

I am using GitKraken for conflict resolution.

NOTE: DO NOT PUSH YOUR CHANGES TO MASTER NOW
@soachishti
Copy link
Collaborator Author

Start your branch with following commit 97eb6be

@soachishti
Copy link
Collaborator Author

I will be working on Report Functionality #6 under AddingReports branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@recluze recluze

@soachishti soachishti

@bilalzaib bilalzaib

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@recluze @soachishti @bilalzaib