![]() then there also those squash operations that simply do nothing and don't report anything either (as mentioned above). I've tried various commit squash operations (squash with parent/selected commits) on the original branch, and noticed that some ask for confimation and succeed, while others fail with the following error (without corrupting the repository):Įrror: only commits reachable from head can be modified So I'll be referring here to commit hashes as found onįor example, attempting to use Edit Commit » Squash with parent on 4579bcd silently fails - whereas usually squash operations either ask for confirmation or result in an error warning box. I've kept a local copy of the original master branch from the above mentioned repository, as it was before the commit squash operations, so I' trying to replay the same operations that led to the original problem of this Issue. I can confirm that the repository is not being corrupted any more by failed commit-squash operations in SM! But it seems to me that some operations are not being executed either. I've just updated SM to Dev Build 2004 (on the Dev channel there's no 2003 build, it bumped from 2002 directly to 2004). When the merge request is ready to merge, select Merge.Could you confirm whether the problem is fixed for you in Build 2003?.(depending on your project configuration), select Modify commit messages. To modify either the squash commit message or the merge commit message If the project’s squashing option is set to either Do not allow or Require. Ensure the Squash commits checkbox is selected.Go to the merge request, and scroll to the merge request reports section that.Squash the commits as part of the merge process: If your project allows you to select squashing options for merge requests, to Select or clear the Squash commits when merge request is accepted checkbox.Go to the merge request and select Edit.Your project must be configured to allow or.Users with permission to create or edit a merge request can set the default squash options Set default squash options for a merge request Project owners can create new default messages for all Committer: User who initiated the squash.Author: User that created the merge request.Message: Description of the squash commit, or a customized message.Fast-forward merges disable merge commits.īy default, squashed commits contain the following metadata: A merge commit, unless you have enabled fast-forward merges.The single commit created by squashing the commits from the branch.Your base branch remains clean, and contains meaningful commit messages.Įach time a branch merges into your base branch, up to two commits are added:.When the single commit merges into the target branch, it retains the full commit history.Small commits are joined together, making it simpler to revert all parts of a change. ![]() In your Git repository by using the squash and merge strategy. As you finish features, you can combine these commits and ensure a cleaner merge history ![]() Help describe the process of building a feature, but can clutter your Git history after the feature
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |