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.

Create a separate commit for builds, much easier to merge/rebase

See original GitHub issue

@shockey @bodnia @webron The /dist folder often comes into merge conflicts, making feature branches difficult to keep clean and up to date.

Is it possible to enforce a rule ( "enforce "), whereby the build happens on its own commit? That way an interactive rebase becomes a smooth operation ( since we just ignore all those build commits, which are useless in a rebase ). The ends are still met, where we have dist built, and in the PR it’ll merge happily

Ultimately just our internal practice and a mention in the README?

Food for thought, I can add the note in the readme - if this makes sense.

Issue Analytics

  • State:closed
  • Created 6 years ago
  • Comments:9 (9 by maintainers)

github_iconTop GitHub Comments

1reaction
webroncommented, May 10, 2017

CONTRIBUTING it is.

1reaction
shockeycommented, May 10, 2017

👍

I already do this. Let’s consider codifying this in the README?

Read more comments on GitHub >

github_iconTop Results From Across the Web

Git Rebase vs Merge: Which Is Better? - Perforce
Avoids merge commit “noise” in busy repos with busy branches. Cleans intermediate commits by making them a single commit, which can be helpful ......
Read more >
Merging vs. Rebasing | Atlassian Git Tutorial
To incorporate the new commits into your feature branch, you have two options: merging or rebasing. The Merge Option. The easiest option is...
Read more >
Git MERGE vs REBASE - YouTube
Understand the differences between MERGE and REBASE and learn you can use these commands in your projects!
Read more >
When do you use Git rebase instead of Git merge?
If you merge --squash feature , feature is merged into master but not committed, so the only new commit on master will be...
Read more >
How to Git rebase a branch to master by example
This Git rebase a branch to master example will show you how to clean up your commit history and sync with the latest...
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