Question

我正在尝试做一个干预的rebase壁球。它声称我没有提交本地更改，但事实并非如此。有什么建议吗？

$ git status
On branch 859423-Modulize-JS-Build-Files
nothing to commit, working tree clean


$ git pull origin 859423-Modulize-JS-Build-Files
From https://tfs/marketing.marketplace
 * branch              859423-Modulize-JS-Build-Files -> FETCH_HEAD
Already up-to-date.

$ git rebase -i develop
error: Your local changes to the following files would be overwritten by merge:
        MarketPlace.Web/Marketplace.WebUI/css/am/site.css
Please commit your changes or stash them before you merge.
Aborting
fatal: cherry-pick failed
Could not apply 8b499ab98b4f23ad30a3b8b2d5bafd9695f8405f... fully working

Answer 1

您可以尝试查看切换分支后问题是否仍然存在。

 public class CustomListAdapterSize extends BaseAdapter {
        private Context context;

        private LayoutInflater inflater;
        private List<ProdSizes> movieItems;
        private List<ProductPackModel> packItems;
        private RadioButton selected =null;
        private int mSelectedPosition = 0;
        private RadioButton mSelectedRB;
        public CustomListAdapterSize(Context context,List<ProdSizes> movieItems) {
            this.context = context;
            this.movieItems=movieItems;

        }

        @Override
        public int getCount() {
            return movieItems.size();
        }

        @Override
        public Object getItem(int position) {
            return movieItems.get(position);
        }

        @Override
        public long getItemId(int position) {
            return position;
        }

        @Override
        public View getView(final int position, View convertView, ViewGroup parent) {
            final ViewHolder holder;
            if (convertView == null) {
                holder = new ViewHolder();
                convertView = LayoutInflater.from(context).inflate(com.vetsupply.au.project.R.layout.listitem_productsizes, null);
                holder.txtproname = (TextView) convertView.findViewById(com.vetsupply.au.project.R.id.txtproductsizenames);
                holder.txtproprice = (TextView) convertView.findViewById(com.vetsupply.au.project.R.id.txtproductsizeprice);
                holder.radioBtn = (RadioButton)convertView.findViewById(com.vetsupply.au.project.R.id.productsize_radio);
                convertView.setTag(holder);
            }else{
                holder = (ViewHolder) convertView.getTag();
            }
            // getting movie data for the row
            final ProdSizes m = movieItems.get(position);
            // title
            holder.txtproname.setText(m.getProViews_Size());
            holder.txtproprice.setText("$"+m.getProViews_MinPrice());

            if (position == getCount() - 1) {
                if (selected == null) {
                    holder.radioBtn.setChecked(true);
                    selected = holder.radioBtn;
                    /*for(int i=0;i<movieItems.size();i++)
                    {
                        sizenms =  movieItems.get(i).getProViews_Size();
                    }
*/

                }
            }

            holder.radioBtn.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View view) {

                    if (selected != null) {
                        selected.setChecked(false);
                    }
                    holder.radioBtn.setChecked(true);
                    selected = holder.radioBtn;
                    ids = m.getProViews_ID();
                    sizenms = m.getProViews_Size();
                    System.out.println(">>>>>>>>>>>>>" + ids);
                    System.out.println("<<<<<<<<<<<" + sizenms);
                    dialogf.dismiss();
                }
            });



            return convertView;
        }
        class ViewHolder{

            TextView txtproname,txtproprice;

            public RadioButton radioBtn;
        }

    }

请参阅edit from "git cherry-pick says local changes exist, but git status says nothing"

git rebase错误地检测到rebase中的本地更改

1 个答案: