git rebase interactive: squash merge commits together

I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / ...

What is the difference between merge --squash and rebase?

I'm new to git and I'm trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase.

Can you add to an enum type in run-time

If I have an enum type: public enum Sport { Tennis = 0; Football = 1; Squash = 2; Volleyball = 3; } Can I somehow add during run-time: PingPong = 4

crystal reports image squashed

Is there any way in Crystal Reports(v11, if this matters) to prevent the images from stretching itself to fit in the whole OLE-object? I'm loading the images dynamically from a database and don't...

Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

How to squash commits in git after they have been pushed?

This gives a good explanation of squashing multiple commits: http://git-scm.com/book/en/Git-Branching-Rebasing but it does not work for commits that have already been pushed. How do I squash the...

Git interactive rebase no commits to pick

I'm on master and I did rebase -i <my_branch> Got this: noop # Rebase c947bec..7e259d3 onto c947bec # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # ...

Is there a way to squash a number of commits non-interactively?

I'm trying to squash a range of commits - HEAD to HEAD~3. Is there a quick way to do this, or do I need to use rebase --interactive?

Cappuccino: Keyboard events getting squashed in reCAPTCHA input field

I'm integrating a reCAPTCHA into my Cappuccino app and I have it all working besides this odd input functionality in the reCAPTCHA input text field: Only some keys seem to work, "qwrszcv" and a...

Git pull after forced update

I just squashed some commits with git rebase and did a git push --force (which is evil, I know). Now the other software engineers have a different history and when they do a git pull, Git will...

git merge squash and recurring conflicts

I have a git repository with master and alt branches. alt branch contains modified version of master code, and i am trying to merge changes from master to alt like this: git merge --squash...

Decorating Hex function to pad zeros

I wrote this simple function: def padded_hex(i, l): given_int = i given_len = l hex_result = hex(given_int)[2:] # remove '0x' from beginning of str num_hex_chars =...

Why can't I use git merge --squash with --no-ff?

I'm trying to use the git merge --squash with the --no-ff parameter, but git does not allow. Someone have any sugestion to help me? I can't use fast forward merge and I need to use the --squash...

Git subtree push always fails

Trying to use git subtree to share common library files across multiple projects. Here's the problem I keep encountering. Add subtree so "lib" subdirectory of my project is coming from lib-dk...

What are the best practices for having git clean history?

Reading about git workflows, I was wondering about the appropriateness of history rewriting. My workflow, and I imagine that of many others, is this: Take Github repository, let's call this...

What does it mean to squash commits in git?

What does Squashing commits in git mean. How do I squash commits in Github? I'm new to Git and I requested to be assigned to a newcomer bug in coala-analyzer. I fixed the bug, and now I was asked...

How to make --squash default on a merge?

We use separate branches for non-trivial bug fixes and features. The branchhes are kept in-sync with master by performing frequent git checkout <x>; git merge master. I noticed when merging, git...

How to squash commit when approve merge request, gitlab

I have two branches master and release at gitlab. At release branch, I hope it will only have commit message like: v0.1.0, v0.1.1. Say after I finished developed v0.1.0, I have have several...

How can I delete all git branches which have been "Squash and Merge" via GitHub?

Ever since GitHub introduced Squash and Merge, all the cool kids at my workplace are using it when merging pull requests. Is there a way to cleanup "Squash and Merge" branches? The following...

How to run docker with experimental functions on Ubuntu 16.04

I have following question: How to run docker with experimental features on (like image squashing docker build --squash=true... for reduce it size) on ubuntu 16.04 ?

Is there a way to specify a default option for merging a pull request in GitHub?

I'm working on a project where "squash and merge" is the preferred approach for merging pull requests. Is there a way to make this the default option in GitHub, either for my own user, or for the...

Git merge conflicts on files that are NOT changed

I went through the following questions...

Git conflicts after squash merge

I have a master branch and a dev branch. e.g. master: A--B--C dev: A--B--C--D--E then I want to release D and E, so I create a release-1.0 branch from master, squash merge dev to release-1.0,...

How to properly implement custom squash function in TF2.0 (custom layer or other)

I'm trying to implement a simple capsnet model in TF2.0. So far, I have added a few conv2d layers, and a reshape layer, but I need to add a squash function now. The issue is that tf.norm() will...

Flutter spaceBetween doesn't work in Column inside Card widget

I've got a Card widget with two columns of information. The left-most Column contains a line of text above an Icon - I want the text at the top of the Card and the Icon at the bottom. The height...

Enable experimental features on github workflow images

We are trying to enable experimental features on the ubuntu-latest image on github workflows, since would like to use squash to reduce image size. However this is not possible as we get the...

Git alias to squash feature-branch commits

I'm frequently squashing all the commits on a feature branch before committing to master. Here's what I do currently: git checkout master git merge --squash {branch} git commit -m...

Best Practices for Git Merge between different versions

Imagine we use Gitflow where we have split a release branch from develop that will eventually be merged into both main and develop. On release there are only quality improvements. Most of these...

How to use tailwind gradient utilities with multiple gradients?

I have a class called show padding, which colors the content box and the padding box differently - actually found it here: https://stackoverflow.com/a/18424078/981556) .show-border { ...

Cannot find "lint" target for the specified project OR Data path "" must have required property 'lintFilePatterns'

After changing my project structure to a monorepo structure in Angular according to this tutorial, I encountered numerous config bugs that I managed to squash after lots of troubleshooting. The...